Minor and major changes

diff --git a/gpsbabel/win32/gui-2/GPSBabelGUI2.dpr b/gpsbabel/win32/gui-2/GPSBabelGUI2.dpr
index 5146fc0ad80b34954adb47dc5c4c0a3a1e68e837..faae7da14a7397d13e0eae6ef5076e4fd65ddee6 100644 (file)
--- a/gpsbabel/win32/gui-2/GPSBabelGUI2.dpr
+++ b/gpsbabel/win32/gui-2/GPSBabelGUI2.dpr
@@ -33,17 +33,10 @@ uses
 \r
 {$R *.RES}\r
 \r
-(*\r
-!!!\r
-gpsbabel.exe -w -i gdb -f "C:\TEMP\2005 Pfunds total.gdb" -x duplicate,shortname -o pathaway -F "C:\TEMP\2005 Pfunds total.pdb"\r
-gpsbabel: Unable to allocate -16056 bytes of memory.\r
-!!!\r
-*)\r
-\r
 begin\r
   AddDomainForResourceString('delphi');\r
 \r
-  UseLanguage('en');                 // for testing\r
+//  UseLanguage('en');                 // for testing\r
 \r
   Application.Initialize;\r
   Application.CreateForm(TfrmMain, frmMain);\r

diff --git a/gpsbabel/win32/gui-2/about.dfm b/gpsbabel/win32/gui-2/about.dfm
index 745de051e3e018cabf6124d4012bf03d9f6c0541..0d894c9093cb3db94543db6df5c68b99f3e10120 100644 (file)
Binary files a/gpsbabel/win32/gui-2/about.dfm and b/gpsbabel/win32/gui-2/about.dfm differ

diff --git a/gpsbabel/win32/gui-2/about.pas b/gpsbabel/win32/gui-2/about.pas
index 247c594c4a98997f5e8ef359a426edfb5d5851eb..f19c2d2cc1637a028a2dd1d8cba0760db412b42c 100644 (file)
--- a/gpsbabel/win32/gui-2/about.pas
+++ b/gpsbabel/win32/gui-2/about.pas
@@ -23,19 +23,24 @@ interface
 uses\r
   gnugettextD4,\r
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,\r
-  StdCtrls, Buttons, ExtCtrls;\r
+  StdCtrls, Buttons, ExtCtrls,\r
+  common;\r
 \r
 type\r
   TfrmAbout = class(TForm)\r
     pnClient: TPanel;\r
     Image1: TImage;\r
-    StaticText1: TStaticText;\r
-    StaticText2: TStaticText;\r
     pnBottom: TPanel;\r
     BitBtn1: TBitBtn;\r
+    StaticText3: TStaticText;\r
+    Panel1: TPanel;\r
+    StaticText1: TStaticText;\r
+    StaticText2: TStaticText;\r
+    Image2: TImage;\r
     procedure FormCreate(Sender: TObject);\r
   private\r
     { Private declarations }\r
+    FTitle: string;\r
   public\r
     { Public declarations }\r
   end;\r
@@ -45,12 +50,18 @@ var
 \r
 implementation\r
 \r
+uses\r
+  utils;\r
+  \r
 {$R *.DFM}\r
 \r
 procedure TfrmAbout.FormCreate(Sender: TObject);\r
 begin\r
   gnugettextD4.TranslateComponent(SELF);\r
+  FTitle := Caption;\r
+  Caption := FTitle + ' GPSBabelGUI-2';\r
+\r
+  FixStaticText(Self);\r
 end;\r
 \r
 end.\r
- 
\ No newline at end of file

diff --git a/gpsbabel/win32/gui-2/filter.dfm b/gpsbabel/win32/gui-2/filter.dfm
index 596daab3fd84a479fdec3e653f3b58029d549e21..486ad565d08735f3d4e0a8075845fbb8cb674cc2 100644 (file)
Binary files a/gpsbabel/win32/gui-2/filter.dfm and b/gpsbabel/win32/gui-2/filter.dfm differ

diff --git a/gpsbabel/win32/gui-2/locale/de/LC_MESSAGES/default.po b/gpsbabel/win32/gui-2/locale/de/LC_MESSAGES/default.po
index c0b8bc006beec35e8acd458ca037768c23dff98f..ca3c81506f5fbe7c889915230f4907f914b72490 100644 (file)
--- a/gpsbabel/win32/gui-2/locale/de/LC_MESSAGES/default.po
+++ b/gpsbabel/win32/gui-2/locale/de/LC_MESSAGES/default.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GPSBabel 1.2.6\n"
 "POT-Creation-Date: 2005-08-12 14:50\n"
-"PO-Revision-Date: 2005-09-22 23:49+0100\n"
+"PO-Revision-Date: 2005-09-29 00:52+0100\n"
 "Last-Translator: Olaf Klein <o.b.klein@t-online.de>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -19,13 +19,13 @@ msgid "About"
 msgstr "Über"
 
 #. frmAbout..Font.Name
-#. frmAbout..pnClient..StaticText1..Font.Name
+#. frmAbout..pnClient..Panel1..StaticText1..Font.Name
 #. frmFilter..Font.Name
 #. frmMain..Font.Name
 #. frmMain..Panel2..lbWhat..Font.Name
 #. frmReadme..Font.Name
 #: about.dfm:12
-#: about.dfm:72
+#: about.dfm:125
 #: filter.dfm:13
 #: main.dfm:11
 #: main.dfm:238
@@ -33,21 +33,20 @@ msgstr "Über"
 msgid "MS Sans Serif"
 msgstr "MS Sans Serif"
 
-#. frmAbout..pnClient..Caption
-#: about.dfm:26
+#. frmAbout..pnClient..StaticText3..Caption
+#: about.dfm:105
 msgid "... under construction"
 msgstr "... in Bearbeitung"
 
-#. frmAbout..pnClient..StaticText1..Caption
-#: about.dfm:68
+#. frmAbout..pnClient..Panel1..StaticText1..Caption
+#: about.dfm:121
 msgid "GPSBabelGUI-2:"
 msgstr "GPSBabelGUI-2:"
 
-#. frmAbout..pnClient..StaticText2..Caption
-#: about.dfm:82
-#, fuzzy
+#. frmAbout..pnClient..Panel1..StaticText2..Caption
+#: about.dfm:139
 msgid "The frontend for gpsbabel command line program"
-msgstr "Das Windows-Fontend für ..."
+msgstr "Das Windows-Fontend für \"gpsbabel.exe\""
 
 #. frmFilter..Caption
 #: filter.dfm:6
@@ -104,7 +103,7 @@ msgstr "ACTIVE LOG # %Y%m%d"
 #. frmFilter..gbTracks..cbTrackSplit..Hint
 #: filter.dfm:91
 msgid "Split track into several tracks depending on date of trackpoint"
-msgstr ""
+msgstr "Erzeuge mehrere Tracks abhängig vom Datum der Trackpunkte"
 
 #. frmFilter..gbTracks..cbTrackSplit..Caption
 #: filter.dfm:92
@@ -132,151 +131,150 @@ msgid "Start at"
 msgstr "Beginnend am"
 
 #. frmFilter..gbTracks..cbTrackStop..Caption
-#: filter.dfm:234
+#: filter.dfm:233
 msgid "stop at"
 msgstr "bis zum"
 
 #. frmFilter..gbTracks..cbTrackPack..Hint
-#: filter.dfm:273
+#: filter.dfm:272
 msgid "Pack all tracks into one track (No duplicate timestamps)"
 msgstr "Alle Tracks zu einem einzigen zusammenfassen (doppelte Zeitstempel unzulässig)"
 
 #. frmFilter..gbTracks..cbTrackPack..Caption
-#: filter.dfm:274
+#: filter.dfm:273
 msgid "&Pack (or)"
 msgstr "&Packen (oder)"
 
 #. frmFilter..gbTracks..cbTrackMerge..Hint
-#: filter.dfm:283
+#: filter.dfm:282
 msgid "Merge all tracks into one track"
 msgstr ""
 
 #. frmFilter..gbTracks..cbTrackMerge..Caption
-#: filter.dfm:284
+#: filter.dfm:283
 msgid "Merge"
 msgstr "Zusammenführen"
 
 #. frmFilter..gbRoutes..Caption
-#: filter.dfm:295
+#: filter.dfm:294
 msgid "&Routes && Tracks"
 msgstr "&Routen && Tracks"
 
 #. frmFilter..gbRoutes..lbRouteSimplifyCount..Caption
-#: filter.dfm:303
+#: filter.dfm:302
 msgid "limit to"
 msgstr "maximal"
 
 #. frmFilter..gbRoutes..lbRouteSimplifyText..Caption
-#: filter.dfm:311
+#: filter.dfm:310
 msgid "Points"
 msgstr "Punkte"
 
 #. frmFilter..gbRoutes..cbRouteSimplify..Hint
-#: filter.dfm:318
+#: filter.dfm:317
 msgid "Simplify routes and tracks by limited number of points"
 msgstr "Limitiert die Anzahl von Wegpunkten in Routen und Tracks"
 
 #. frmFilter..gbRoutes..cbRouteSimplify..Caption
-#: filter.dfm:319
+#: filter.dfm:318
 msgid "Simplify"
 msgstr "Vereinfachen"
 
 #. frmFilter..gbRoutes..edRoutesSimplifyMaxPoints..Hint
-#: filter.dfm:328
+#: filter.dfm:327
 msgid "Upper limit of points for routes and tracks"
 msgstr "Maximale Anzahl an Punkten innerhalb von Routen und Tracks"
 
 #. frmFilter..gbRoutes..edRoutesSimplifyMaxPoints..Text
-#: filter.dfm:333
+#: filter.dfm:332
 msgid "50 "
 msgstr "50 "
 
 #. frmFilter..gbRoutes..cbReverse..Hint
-#: filter.dfm:352
+#: filter.dfm:351
 msgid "Reverse routes and tracks"
 msgstr "Reihenfolge von Wegpunkten in Routen und Tracks umdrehen"
 
 #. frmFilter..gbRoutes..cbReverse..Caption
-#: filter.dfm:353
+#: filter.dfm:352
 msgid "Reverse"
 msgstr "Umdrehen"
 
 #. frmFilter..pnBottom..btnOK..Caption
-#: filter.dfm:370
+#: filter.dfm:369
 msgid "OK"
 msgstr "OK"
 
 #. frmFilter..pnBottom..BitBtn1..Caption
-#: filter.dfm:406
+#: filter.dfm:405
 msgid "File based filters"
 msgstr "Datei basierende Filter"
 
 #. frmFilter..gbWaypoints..Caption
 #. frmMain..Panel2..cbWaypoints..Caption
-#: filter.dfm:426
+#: filter.dfm:425
 #: main.dfm:373
 msgid "&Waypoints"
 msgstr "&Wegpunkte"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupLoc..Hint
-#: filter.dfm:452
+#: filter.dfm:451
 msgid "Merge waypoints with duplicate locations"
 msgstr "Fasse Wegpunkte mit gleichen Koordinaten zusammen"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupLoc..Caption
-#: filter.dfm:453
+#: filter.dfm:452
 msgid "locations"
-msgstr ""
+msgstr "Koordinaten"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupNames..Hint
-#: filter.dfm:462
+#: filter.dfm:461
 msgid "Merge waypoints with duplicate \"short name\""
 msgstr "Fasse Wegpunkte mit gleichem Namen zusammen"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupNames..Caption
-#: filter.dfm:463
+#: filter.dfm:462
 msgid "\"short names\""
 msgstr "\"Kurznamen\""
 
 #. frmFilter..gbWaypoints..cbWayptMergeDistance..Hint
-#: filter.dfm:472
-#, fuzzy
+#: filter.dfm:471
 msgid "Merge waypoints separated by less then"
 msgstr ""
 
 #. frmFilter..gbWaypoints..cbWayptMergeDistance..Caption
-#: filter.dfm:473
+#: filter.dfm:472
 msgid "Radius"
 msgstr "Radius"
 
 #. frmFilter..gbWaypoints..cobWayptMergeDist....Items.Strings
-#: filter.dfm:487
+#: filter.dfm:486
 msgid "Feet"
 msgstr "Feet"
 
 #. frmFilter..gbWaypoints..cobWayptMergeDist....Items.Strings
-#: filter.dfm:488
+#: filter.dfm:487
 #: filter.pas:163
 msgid "Miles"
 msgstr "Miles"
 
 #. frmFilter..gbWaypoints..cbWayptSort..Hint
-#: filter.dfm:505
+#: filter.dfm:504
 msgid "Sort waypoints by \"short name\" or by description"
 msgstr "Sortiere Wegpunkte nach Name oder Beschreibung"
 
 #. frmFilter..gbWaypoints..cbWayptSort..Caption
-#: filter.dfm:506
+#: filter.dfm:505
 msgid "Sort"
 msgstr "Sortieren"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDups..Hint
-#: filter.dfm:514
+#: filter.dfm:513
 msgid "Merge duplicate waypoints"
 msgstr "Entferne doppelte Wegpunkte"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDups..Caption
-#: filter.dfm:515
+#: filter.dfm:514
 msgid "Duplicatates"
 msgstr "Duplikate"
 
@@ -360,14 +358,14 @@ msgstr "&Routen"
 #. frmMain..Panel2..btnFilter..Caption
 #. frmMain..ActionList1..acFilterSelect..Caption
 #: main.dfm:404
-#: main.dfm:907
+#: main.dfm:909
 msgid "&Filter"
 msgstr "&Filter"
 
 #. frmMain..Panel2..btnProcess..Caption
 #. frmMain..ActionList1..acConvert..Caption
 #: main.dfm:428
-#: main.dfm:900
+#: main.dfm:902
 msgid "let's go"
 msgstr "und los"
 
@@ -376,98 +374,139 @@ msgstr "und los"
 msgid "Fixedsys"
 msgstr "Fixedsys"
 
-#. frmMain..stbMain......Text
-#: main.dfm:473
-msgid "http://sourceforge.net/projects/gpsbabel"
-msgstr "http://sourceforge.net/projects/gpsbabel"
+#. frmMain..stbMain........Text
+#: main.dfm:475
+msgid "http://www.gpsbabel.org (http://sourceforge.net/projects/gpsbabel)"
+msgstr "http://www.gpsbabel.org (http://sourceforge.net/projects/gpsbabel)"
 
 #. frmMain..OpenDialog..Filter
-#: main.dfm:480
+#: main.dfm:482
 msgid "Garmin Mapsource|*.gdb|Garmin Mapsource mps|*.mps|All files|*.*"
 msgstr "Garmin Mapsource|*.gdb|Garmin Mapsource mps|*.mps|All files|*.*"
 
 #. frmMain..ActionList1..acConvert..Category
 #. frmMain..ActionList1..acFilterSelect..Category
-#: main.dfm:899
-#: main.dfm:906
+#: main.dfm:901
+#: main.dfm:908
 msgid "Babel"
 msgstr "Babel"
 
 #. frmMain..ActionList1..acFileExit..Category
-#: main.dfm:912
+#: main.dfm:914
 msgid "File"
 msgstr "Datei"
 
 #. frmMain..ActionList1..acFileExit..Caption
-#: main.dfm:913
+#: main.dfm:915
 msgid "E&xit"
 msgstr "Beenden"
 
 #. frmMain..ActionList1..acHelpAbout..Category
 #. frmMain..ActionList1..acHelpIntro..Category
 #. frmMain..ActionList1..acHelpReadme..Category
-#: main.dfm:918
-#: main.dfm:923
-#: main.dfm:927
+#: main.dfm:920
+#: main.dfm:925
+#: main.dfm:929
 msgid "Help"
 msgstr "Hilfe"
 
 #. frmMain..ActionList1..acHelpAbout..Caption
-#: main.dfm:919
+#: main.dfm:921
 msgid "&About"
 msgstr "Über"
 
 #. frmMain..ActionList1..acHelpIntro..Caption
-#: main.dfm:924
+#: main.dfm:926
 msgid "&Intro"
 msgstr "Einführung"
 
 #. frmMain..ActionList1..acHelpReadme..Caption
 #. frmReadme..Caption
-#: main.dfm:928
+#: main.dfm:930
 #: readme.dfm:6
 msgid "GPSBabel README"
 msgstr "GPSBabel README"
 
 #. frmMain..MainMenu1..mnuFile..Caption
-#: main.dfm:937
+#: main.dfm:939
 msgid "&File"
 msgstr "&Datei"
 
+#. frmMain..MainMenu1..mnuOptions..Caption
+#: main.dfm:945
+msgid "&Options"
+msgstr "&Optionen"
+
+#. frmMain..MainMenu1..mnuOptions..mnuSynthesizeShortNames..Caption
+#: main.dfm:947
+msgid "Synthesize short names"
+msgstr "Synthetisiere Kurznamen"
+
+#. frmMain..MainMenu1..mnuOptions..mnuSynthesizeShortNames....Hint
+#: main.dfm:950
+msgid "Ignore \"short\" names from source data and synthesize them from the long name"
+msgstr ""
+
 #. frmMain..MainMenu1..mnuHelp..Caption
-#: main.dfm:943
+#: main.dfm:956
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: main.pas:249
+#. frmMain..MainMenu1..mnuHelp..N1..Caption
+#: main.dfm:964
+msgid "-"
+msgstr "-"
+
+#: main.pas:152
+msgid " (Preview)"
+msgstr " (Vorschau)"
+
+#: main.pas:255
 msgid "All files|*.*"
 msgstr "Alle Dateien|*.*"
 
-#: main.pas:338
+#: main.pas:344
 msgid "|All files|*.*"
 msgstr "|Alle Dateien|*.*"
 
-#: main.pas:377
+#: main.pas:385
 msgid "File %s not found."
 msgstr "Datei \"%s\" nicht gefunden."
 
-#: main.pas:394
+#: main.pas:402
 msgid "File \"%s\" exists ! Overwrite ?"
 msgstr "Datei \"%s\" existiert bereits! Überschreiben?"
 
-#: main.pas:395
+#: main.pas:403
 msgid "Warning"
 msgstr "Warnung"
 
-#: main.pas:420
+#: main.pas:428
 msgid "Could not run \"gpsbabel.exe\"!"
 msgstr "Konnte \"gpsbabel.exe\" nicht ausführen!"
 
-#: main.pas:429
+#: main.pas:437
 msgid "Converted successfully from \"%s\" to \"%s\"."
 msgstr "Erfolgreich konvertiert von \"%s\" zu \"%s\"."
 
-#: main.pas:430
+#: main.pas:438
 msgid "Success"
 msgstr "Erfolg"
 
+#: utils.pas:73
+msgid "Error WINAPI: Could not create \"NamedPipe\"!"
+msgstr "Fehler WINAPI:  \"NamedPipe\" konnte nicht erstellt werden!"
+
+#: utils.pas:78
+msgid "\"gpsbabel.exe\" not found!!!"
+msgstr ""
+
+#. dwCreationFlags,     // creation flags
+#: utils.pas:97
+msgid "Could not run \"gpsbabel.exe\" (Error %d)!"
+msgstr "Konnte \"gpsbabel.exe\" nicht ausführen (Fehler %d)!"
+
+#: utils.pas:103
+msgid "\"gpsbabel.exe\" returned error 0x%x (%d)"
+msgstr "\"gpsbabel.exe\" verließ uns mit Fehler 0x%x (%d)!"
+

diff --git a/gpsbabel/win32/gui-2/locale/fr/LC_MESSAGES/default.po b/gpsbabel/win32/gui-2/locale/fr/LC_MESSAGES/default.po
index 5cdaafa58490deebe5f9adaf001571f0ca8a6267..9e3b903f29f5128b751d69cd2ecf5d11fc5b746c 100644 (file)
--- a/gpsbabel/win32/gui-2/locale/fr/LC_MESSAGES/default.po
+++ b/gpsbabel/win32/gui-2/locale/fr/LC_MESSAGES/default.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: French version\n"
 "POT-Creation-Date: 2005-09-22 23:44\n"
-"PO-Revision-Date: 2005-09-24 22:45+0100\n"
-"Last-Translator: Lilian Morinon <lilian_morinon@yahoo.fr>\n"
+"PO-Revision-Date: 2005-09-29 01:32+0100\n"
+"Last-Translator: Olaf Klein <o.b.klein@t-online.de>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,32 +24,32 @@ msgid "About"
 msgstr "A propos"
 
 #. frmAbout..Font.Name
-#. frmAbout..pnClient..StaticText1..Font.Name
+#. frmAbout..pnClient..Panel1..StaticText1..Font.Name
 #. frmFilter..Font.Name
 #. frmMain..Font.Name
 #. frmMain..Panel2..lbWhat..Font.Name
 #. frmReadme..Font.Name
 #: about.dfm:12
-#: about.dfm:72
+#: about.dfm:125
 #: filter.dfm:13
 #: main.dfm:11
 #: main.dfm:238
 #: readme.dfm:11
 msgid "MS Sans Serif"
-msgstr ""
+msgstr "MS Sans Serif"
 
-#. frmAbout..pnClient..Caption
-#: about.dfm:26
+#. frmAbout..pnClient..StaticText3..Caption
+#: about.dfm:105
 msgid "... under construction"
 msgstr "...en travaux"
 
-#. frmAbout..pnClient..StaticText1..Caption
-#: about.dfm:68
+#. frmAbout..pnClient..Panel1..StaticText1..Caption
+#: about.dfm:121
 msgid "GPSBabelGUI-2:"
-msgstr ""
+msgstr "GPSBabelGUI-2:"
 
-#. frmAbout..pnClient..StaticText2..Caption
-#: about.dfm:82
+#. frmAbout..pnClient..Panel1..StaticText2..Caption
+#: about.dfm:139
 msgid "The frontend for gpsbabel command line program"
 msgstr "L'interface graphique de gpsbabel"
 
@@ -103,7 +103,7 @@ msgstr "Tit&re"
 #. frmFilter..gbTracks..edTrackTitle..Text
 #: filter.dfm:84
 msgid "ACTIVE LOG # %Y%m%d"
-msgstr ""
+msgstr "ACTIVE LOG # %Y%m%d"
 
 #. frmFilter..gbTracks..cbTrackSplit..Hint
 #: filter.dfm:91
@@ -136,157 +136,157 @@ msgid "Start at"
 msgstr "Commencer à"
 
 #. frmFilter..gbTracks..cbTrackStop..Caption
-#: filter.dfm:234
+#: filter.dfm:233
 msgid "stop at"
 msgstr "Arrêter à"
 
 #. frmFilter..gbTracks..cbTrackPack..Hint
-#: filter.dfm:273
+#: filter.dfm:272
 msgid "Pack all tracks into one track (No duplicate timestamps)"
 msgstr "Fusionner toutes les traces en une seule (pas de duplication de l'horodatage)"
 
 #. frmFilter..gbTracks..cbTrackPack..Caption
-#: filter.dfm:274
+#: filter.dfm:273
 msgid "&Pack (or)"
 msgstr "&Fusionner (ou)"
 
 #. frmFilter..gbTracks..cbTrackMerge..Hint
-#: filter.dfm:283
+#: filter.dfm:282
 msgid "Merge all tracks into one track"
 msgstr "Fusionner toutes les traces en une seule"
 
 #. frmFilter..gbTracks..cbTrackMerge..Caption
-#: filter.dfm:284
+#: filter.dfm:283
 msgid "Merge"
 msgstr "Fusionner"
 
 #. frmFilter..gbRoutes..Caption
-#: filter.dfm:295
+#: filter.dfm:294
 msgid "&Routes && Tracks"
 msgstr "&Routes && Traces"
 
 #. frmFilter..gbRoutes..lbRouteSimplifyCount..Caption
-#: filter.dfm:303
+#: filter.dfm:302
 msgid "limit to"
 msgstr "limiter à"
 
 #. frmFilter..gbRoutes..lbRouteSimplifyText..Caption
-#: filter.dfm:311
+#: filter.dfm:310
 msgid "Points"
 msgstr ""
 
 #. frmFilter..gbRoutes..cbRouteSimplify..Hint
-#: filter.dfm:318
+#: filter.dfm:317
 msgid "Simplify routes and tracks by limited number of points"
 msgstr "Simplifier les routes et traces en limitant le nombre de points"
 
 #. frmFilter..gbRoutes..cbRouteSimplify..Caption
-#: filter.dfm:319
+#: filter.dfm:318
 msgid "Simplify"
 msgstr "Simplifier"
 
 #. frmFilter..gbRoutes..edRoutesSimplifyMaxPoints..Hint
-#: filter.dfm:328
+#: filter.dfm:327
 msgid "Upper limit of points for routes and tracks"
 msgstr "Limite maximum du nombre de points pour les routes et traces"
 
 #. frmFilter..gbRoutes..edRoutesSimplifyMaxPoints..Text
-#: filter.dfm:333
+#: filter.dfm:332
 msgid "50 "
-msgstr ""
+msgstr "50 "
 
 #. frmFilter..gbRoutes..cbReverse..Hint
-#: filter.dfm:352
+#: filter.dfm:351
 msgid "Reverse routes and tracks"
 msgstr "Inverser les routes et les traces"
 
 #. frmFilter..gbRoutes..cbReverse..Caption
-#: filter.dfm:353
+#: filter.dfm:352
 msgid "Reverse"
 msgstr "Inverser"
 
 #. frmFilter..pnBottom..btnOK..Caption
-#: filter.dfm:370
+#: filter.dfm:369
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #. frmFilter..pnBottom..BitBtn1..Caption
-#: filter.dfm:406
+#: filter.dfm:405
 msgid "File based filters"
 msgstr "Filtres de fichiers"
 
 #. frmFilter..gbWaypoints..Caption
 #. frmMain..Panel2..cbWaypoints..Caption
-#: filter.dfm:426
+#: filter.dfm:425
 #: main.dfm:373
 msgid "&Waypoints"
 msgstr ""
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupLoc..Hint
-#: filter.dfm:452
+#: filter.dfm:451
 msgid "Merge waypoints with duplicate locations"
 msgstr "Fusionner les waypoints avec les positions en doublon"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupLoc..Caption
-#: filter.dfm:453
+#: filter.dfm:452
 msgid "locations"
 msgstr "positions"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupNames..Hint
-#: filter.dfm:462
+#: filter.dfm:461
 msgid "Merge waypoints with duplicate \"short name\""
 msgstr "Fusionner les waypoints avec les doublons \"short name\""
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupNames..Caption
-#: filter.dfm:463
+#: filter.dfm:462
 msgid "\"short names\""
 msgstr ""
 
 #. frmFilter..gbWaypoints..cbWayptMergeDistance..Hint
-#: filter.dfm:472
+#: filter.dfm:471
 msgid "Merge waypoints separated by less then"
 msgstr "Fusionner les waypoints séparé par moins de"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDistance..Caption
-#: filter.dfm:473
+#: filter.dfm:472
 msgid "Radius"
 msgstr "Rayon"
 
 #. frmFilter..gbWaypoints..cobWayptMergeDist....Items.Strings
-#: filter.dfm:487
+#: filter.dfm:486
 msgid "Feet"
 msgstr ""
 
 #. frmFilter..gbWaypoints..cobWayptMergeDist....Items.Strings
-#: filter.dfm:488
+#: filter.dfm:487
 #: filter.pas:163
 msgid "Miles"
 msgstr ""
 
 #. frmFilter..gbWaypoints..cbWayptSort..Hint
-#: filter.dfm:505
+#: filter.dfm:504
 msgid "Sort waypoints by \"short name\" or by description"
 msgstr "Trier les waypoints par \"short name\" ou par description"
 
 #. frmFilter..gbWaypoints..cbWayptSort..Caption
-#: filter.dfm:506
+#: filter.dfm:505
 msgid "Sort"
 msgstr "Trier"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDups..Hint
-#: filter.dfm:514
+#: filter.dfm:513
 msgid "Merge duplicate waypoints"
 msgstr "Fusionner les waypoints identiques"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDups..Caption
-#: filter.dfm:515
+#: filter.dfm:514
 msgid "Duplicatates"
 msgstr "Doublons"
 
 #. frmMain..Caption
 #: main.dfm:6
 msgid "GPSBabelGUI-2"
-msgstr ""
+msgstr "GPSBabelGUI-2"
 
 #. frmMain..Panel1..lbInputFile..Caption
 #: main.dfm:78
@@ -320,35 +320,35 @@ msgstr "Périphérique"
 #: main.dfm:162
 #: main.dfm:211
 msgid "USB"
-msgstr ""
+msgstr "USB"
 
 #. frmMain..Panel1..cbInputDevice....Items.Strings
 #. frmMain..Panel1..cbOutputDevice....Items.Strings
 #: main.dfm:163
 #: main.dfm:212
 msgid "COM1"
-msgstr ""
+msgstr "COM1"
 
 #. frmMain..Panel1..cbInputDevice....Items.Strings
 #. frmMain..Panel1..cbOutputDevice....Items.Strings
 #: main.dfm:164
 #: main.dfm:213
 msgid "COM2"
-msgstr ""
+msgstr "COM2"
 
 #. frmMain..Panel1..cbInputDevice....Items.Strings
 #. frmMain..Panel1..cbOutputDevice....Items.Strings
 #: main.dfm:165
 #: main.dfm:214
 msgid "COM3"
-msgstr ""
+msgstr "COM3"
 
 #. frmMain..Panel1..cbInputDevice....Items.Strings
 #. frmMain..Panel1..cbOutputDevice....Items.Strings
 #: main.dfm:166
 #: main.dfm:215
 msgid "COM4"
-msgstr ""
+msgstr "COM4"
 
 #. frmMain..Panel2..lbWhat..Caption
 #: main.dfm:234
@@ -363,114 +363,155 @@ msgstr ""
 #. frmMain..Panel2..btnFilter..Caption
 #. frmMain..ActionList1..acFilterSelect..Caption
 #: main.dfm:404
-#: main.dfm:907
+#: main.dfm:909
 msgid "&Filter"
 msgstr "&Filtre"
 
 #. frmMain..Panel2..btnProcess..Caption
 #. frmMain..ActionList1..acConvert..Caption
 #: main.dfm:428
-#: main.dfm:900
+#: main.dfm:902
 msgid "let's go"
 msgstr "Lancer"
 
 #. frmMain..memoOutput..Font.Name
 #: main.dfm:455
 msgid "Fixedsys"
-msgstr ""
+msgstr "Fixedsys"
 
-#. frmMain..stbMain......Text
-#: main.dfm:473
-msgid "http://sourceforge.net/projects/gpsbabel"
-msgstr ""
+#. frmMain..stbMain........Text
+#: main.dfm:475
+msgid "http://www.gpsbabel.org (http://sourceforge.net/projects/gpsbabel)"
+msgstr "http://www.gpsbabel.org (http://sourceforge.net/projects/gpsbabel)"
 
 #. frmMain..OpenDialog..Filter
-#: main.dfm:480
+#: main.dfm:482
 msgid "Garmin Mapsource|*.gdb|Garmin Mapsource mps|*.mps|All files|*.*"
 msgstr "Garmin Mapsource|*.gdb|Garmin Mapsource mps|*.mps|Tous les fichiers|*.*"
 
 #. frmMain..ActionList1..acConvert..Category
 #. frmMain..ActionList1..acFilterSelect..Category
-#: main.dfm:899
-#: main.dfm:906
+#: main.dfm:901
+#: main.dfm:908
 msgid "Babel"
-msgstr ""
+msgstr "Babel"
 
 #. frmMain..ActionList1..acFileExit..Category
-#: main.dfm:912
+#: main.dfm:914
 msgid "File"
 msgstr "Fichier"
 
 #. frmMain..ActionList1..acFileExit..Caption
-#: main.dfm:913
+#: main.dfm:915
 msgid "E&xit"
 msgstr "F&ermer"
 
 #. frmMain..ActionList1..acHelpAbout..Category
 #. frmMain..ActionList1..acHelpIntro..Category
 #. frmMain..ActionList1..acHelpReadme..Category
-#: main.dfm:918
-#: main.dfm:923
-#: main.dfm:927
+#: main.dfm:920
+#: main.dfm:925
+#: main.dfm:929
 msgid "Help"
 msgstr "Aide"
 
 #. frmMain..ActionList1..acHelpAbout..Caption
-#: main.dfm:919
+#: main.dfm:921
 msgid "&About"
 msgstr "&A propos"
 
 #. frmMain..ActionList1..acHelpIntro..Caption
-#: main.dfm:924
+#: main.dfm:926
 msgid "&Intro"
 msgstr "&Introduction"
 
 #. frmMain..ActionList1..acHelpReadme..Caption
 #. frmReadme..Caption
-#: main.dfm:928
+#: main.dfm:930
 #: readme.dfm:6
 msgid "GPSBabel README"
 msgstr "GPSBabel README"
 
 #. frmMain..MainMenu1..mnuFile..Caption
-#: main.dfm:937
+#: main.dfm:939
 msgid "&File"
 msgstr "&Fichier"
 
+#. frmMain..MainMenu1..mnuOptions..Caption
+#: main.dfm:945
+msgid "&Options"
+msgstr ""
+
+#. frmMain..MainMenu1..mnuOptions..mnuSynthesizeShortNames..Caption
+#: main.dfm:947
+msgid "Synthesize short names"
+msgstr ""
+
+#. frmMain..MainMenu1..mnuOptions..mnuSynthesizeShortNames....Hint
+#: main.dfm:950
+msgid "Ignore \"short\" names from source data and synthesize them from the long name"
+msgstr ""
+
 #. frmMain..MainMenu1..mnuHelp..Caption
-#: main.dfm:943
+#: main.dfm:956
 msgid "&Help"
 msgstr "&Aide"
 
-#: main.pas:249
+#. frmMain..MainMenu1..mnuHelp..N1..Caption
+#: main.dfm:964
+msgid "-"
+msgstr "-"
+
+#: main.pas:152
+msgid " (Preview)"
+msgstr ""
+
+#: main.pas:255
 msgid "All files|*.*"
 msgstr "Tous les fichiers|*.*"
 
-#: main.pas:338
+#: main.pas:344
 msgid "|All files|*.*"
 msgstr "|Tous les fichiers|*.*"
 
-#: main.pas:377
+#: main.pas:385
 msgid "File %s not found."
 msgstr "Fichier%s non trouvé."
 
-#: main.pas:394
+#: main.pas:402
 msgid "File \"%s\" exists ! Overwrite ?"
 msgstr "Le fichier \"%s\" existe déjà ! Ecraser ?"
 
-#: main.pas:395
+#: main.pas:403
 msgid "Warning"
 msgstr "Attention"
 
-#: main.pas:420
+#: main.pas:428
 msgid "Could not run \"gpsbabel.exe\"!"
 msgstr "Impossible d'éxécuter \"gpsbabel.exe\"!"
 
-#: main.pas:429
+#: main.pas:437
 msgid "Converted successfully from \"%s\" to \"%s\"."
 msgstr "Conversion de \"%s\" à \"%s\" réussie."
 
-#: main.pas:430
+#: main.pas:438
 msgid "Success"
 msgstr "Succès"
 
+#: utils.pas:76
+msgid "Error WINAPI: Could not create \"NamedPipe\"!"
+msgstr ""
+
+#: utils.pas:81
+msgid "\"gpsbabel.exe\" not found!!!"
+msgstr ""
+
+#. dwCreationFlags,     // creation flags
+#: utils.pas:100
+msgid "Could not run \"gpsbabel.exe\" (Error %d)!"
+msgstr ""
+
+#: utils.pas:106
+msgid "\"gpsbabel.exe\" returned error 0x%x (%d)"
+msgstr ""
+

diff --git a/gpsbabel/win32/gui-2/main.dfm b/gpsbabel/win32/gui-2/main.dfm
index 32911004ebee6c5bbc7c0a586dd99ec369bef994..aaeb6336629d7b371a18ae2da0b82ce5903d65b9 100644 (file)
Binary files a/gpsbabel/win32/gui-2/main.dfm and b/gpsbabel/win32/gui-2/main.dfm differ

diff --git a/gpsbabel/win32/gui-2/main.pas b/gpsbabel/win32/gui-2/main.pas
index e909f5d814ea15f4630b81e97f245b5cc506ee1d..8fcbd091de5cecc46ab7c3c7d1bf7fe72c49c012 100644 (file)
--- a/gpsbabel/win32/gui-2/main.pas
+++ b/gpsbabel/win32/gui-2/main.pas
@@ -78,6 +78,8 @@ type
     mnuReadme: TMenuItem;\r
     acHelpReadme: TAction;\r
     N1: TMenuItem;\r
+    mnuOptions: TMenuItem;\r
+    mnuSynthesizeShortNames: TMenuItem;\r
     procedure FormShow(Sender: TObject);\r
     procedure FormCreate(Sender: TObject);\r
     procedure OpenButtonClick(Sender: TObject);\r
@@ -98,6 +100,7 @@ type
     procedure FormClose(Sender: TObject; var Action: TCloseAction);\r
     procedure chbOutputDeviceClick(Sender: TObject);\r
     procedure acHelpReadmeExecute(Sender: TObject);\r
+    procedure mnuSynthesizeShortNamesClick(Sender: TObject);\r
   private\r
     { Private-Deklarationen }\r
     FCaps: TCapabilities;\r
@@ -371,6 +374,8 @@ begin
   if cbWaypoints.Checked then cmdline := cmdline + ' -w';\r
   if cbRoutes.Checked then cmdline := cmdline + ' -r';\r
   if cbTracks.Checked then cmdline := cmdline + ' -t';\r
+  \r
+  if mnuSynthesizeShortNames.Checked then cmdline := cmdline + ' -s';\r
 \r
   if chbInputDevice.Checked then\r
     s := SysUtils.AnsiLowerCase(cbInputDevice.Text) + ':'\r
@@ -566,5 +571,10 @@ begin
   frmReadme.ShowModal;\r
 end;\r
 \r
+procedure TfrmMain.mnuSynthesizeShortNamesClick(Sender: TObject);\r
+begin\r
+  mnuSynthesizeShortNames.Checked := not(mnuSynthesizeShortNames.Checked);\r
+end;\r
+\r
 end.\r
  
\ No newline at end of file

diff --git a/gpsbabel/win32/gui-2/template.po b/gpsbabel/win32/gui-2/template.po
index fe5634cc636fb2bb4fc599154f99e46ada9c58db..43c7db267f03f87671deb621a10e85f3bf9c685a 100644 (file)
--- a/gpsbabel/win32/gui-2/template.po
+++ b/gpsbabel/win32/gui-2/template.po
@@ -2,17 +2,18 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER\r
 # This file is distributed under the same license as the PACKAGE package.\r
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.\r
-#\r
+# \r
+#, fuzzy\r
 msgid ""\r
 msgstr ""\r
 "Project-Id-Version: PACKAGE VERSION\n"\r
-"POT-Creation-Date: 2005-09-22 23:44\n"\r
-"PO-Revision-Date: 2005-09-22 23:44\n"\r
+"POT-Creation-Date: 2005-09-29 01:27\n"\r
+"PO-Revision-Date: 2005-09-29 01:27\n"\r
 "Last-Translator: Somebody <your.email@address.com>\n"\r
 "MIME-Version: 1.0\n"\r
 "Content-Type: text/plain; charset=UTF-8\n"\r
 "Content-Transfer-Encoding: 8bit\n"\r
-"X-Generator: dxgettext 1.2\n"\r
+"X-Generator: dxgettext 1.2.1\n"\r
 \r
 #. frmAbout..Caption\r
 #: about.dfm:5\r
@@ -21,8 +22,8 @@ msgstr ""
 \r
 #. frmAbout..Font.Name\r
 #: about.dfm:12\r
-#. frmAbout..pnClient..StaticText1..Font.Name\r
-#: about.dfm:72\r
+#. frmAbout..pnClient..Panel1..StaticText1..Font.Name\r
+#: about.dfm:125\r
 #. frmFilter..Font.Name\r
 #: filter.dfm:13\r
 #. frmMain..Font.Name\r
@@ -34,18 +35,18 @@ msgstr ""
 msgid "MS Sans Serif"\r
 msgstr ""\r
 \r
-#. frmAbout..pnClient..Caption\r
-#: about.dfm:26\r
+#. frmAbout..pnClient..StaticText3..Caption\r
+#: about.dfm:105\r
 msgid "... under construction"\r
 msgstr ""\r
 \r
-#. frmAbout..pnClient..StaticText1..Caption\r
-#: about.dfm:68\r
+#. frmAbout..pnClient..Panel1..StaticText1..Caption\r
+#: about.dfm:121\r
 msgid "GPSBabelGUI-2:"\r
 msgstr ""\r
 \r
-#. frmAbout..pnClient..StaticText2..Caption\r
-#: about.dfm:82\r
+#. frmAbout..pnClient..Panel1..StaticText2..Caption\r
+#: about.dfm:139\r
 msgid "The frontend for gpsbabel command line "\r
 "program"\r
 msgstr ""\r
@@ -134,155 +135,155 @@ msgid "Start at"
 msgstr ""\r
 \r
 #. frmFilter..gbTracks..cbTrackStop..Caption\r
-#: filter.dfm:234\r
+#: filter.dfm:233\r
 msgid "stop at"\r
 msgstr ""\r
 \r
 #. frmFilter..gbTracks..cbTrackPack..Hint\r
-#: filter.dfm:273\r
+#: filter.dfm:272\r
 msgid "Pack all tracks into one track (No duplicate "\r
 "timestamps)"\r
 msgstr ""\r
 \r
 #. frmFilter..gbTracks..cbTrackPack..Caption\r
-#: filter.dfm:274\r
+#: filter.dfm:273\r
 msgid "&Pack (or)"\r
 msgstr ""\r
 \r
 #. frmFilter..gbTracks..cbTrackMerge..Hint\r
-#: filter.dfm:283\r
+#: filter.dfm:282\r
 msgid "Merge all tracks into one track"\r
 msgstr ""\r
 \r
 #. frmFilter..gbTracks..cbTrackMerge..Caption\r
-#: filter.dfm:284\r
+#: filter.dfm:283\r
 msgid "Merge"\r
 msgstr ""\r
 \r
 #. frmFilter..gbRoutes..Caption\r
-#: filter.dfm:295\r
+#: filter.dfm:294\r
 msgid "&Routes && Tracks"\r
 msgstr ""\r
 \r
 #. frmFilter..gbRoutes..lbRouteSimplifyCount..Caption\r
-#: filter.dfm:303\r
+#: filter.dfm:302\r
 msgid "limit to"\r
 msgstr ""\r
 \r
 #. frmFilter..gbRoutes..lbRouteSimplifyText..Caption\r
-#: filter.dfm:311\r
+#: filter.dfm:310\r
 msgid "Points"\r
 msgstr ""\r
 \r
 #. frmFilter..gbRoutes..cbRouteSimplify..Hint\r
-#: filter.dfm:318\r
+#: filter.dfm:317\r
 msgid "Simplify routes and tracks by limited number of "\r
 "points"\r
 msgstr ""\r
 \r
 #. frmFilter..gbRoutes..cbRouteSimplify..Caption\r
-#: filter.dfm:319\r
+#: filter.dfm:318\r
 msgid "Simplify"\r
 msgstr ""\r
 \r
 #. frmFilter..gbRoutes..edRoutesSimplifyMaxPoints..Hint\r
-#: filter.dfm:328\r
+#: filter.dfm:327\r
 msgid "Upper limit of points for routes and "\r
 "tracks"\r
 msgstr ""\r
 \r
 #. frmFilter..gbRoutes..edRoutesSimplifyMaxPoints..Text\r
-#: filter.dfm:333\r
+#: filter.dfm:332\r
 msgid "50 "\r
 msgstr ""\r
 \r
 #. frmFilter..gbRoutes..cbReverse..Hint\r
-#: filter.dfm:352\r
+#: filter.dfm:351\r
 msgid "Reverse routes and tracks"\r
 msgstr ""\r
 \r
 #. frmFilter..gbRoutes..cbReverse..Caption\r
-#: filter.dfm:353\r
+#: filter.dfm:352\r
 msgid "Reverse"\r
 msgstr ""\r
 \r
 #. frmFilter..pnBottom..btnOK..Caption\r
-#: filter.dfm:370\r
+#: filter.dfm:369\r
 msgid "OK"\r
 msgstr ""\r
 \r
 #. frmFilter..pnBottom..BitBtn1..Caption\r
-#: filter.dfm:406\r
+#: filter.dfm:405\r
 msgid "File based filters"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..Caption\r
-#: filter.dfm:426\r
+#: filter.dfm:425\r
 #. frmMain..Panel2..cbWaypoints..Caption\r
 #: main.dfm:373\r
 msgid "&Waypoints"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptMergeDupLoc..Hint\r
-#: filter.dfm:452\r
+#: filter.dfm:451\r
 msgid "Merge waypoints with duplicate locations"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptMergeDupLoc..Caption\r
-#: filter.dfm:453\r
+#: filter.dfm:452\r
 msgid "locations"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptMergeDupNames..Hint\r
-#: filter.dfm:462\r
+#: filter.dfm:461\r
 msgid "Merge waypoints with duplicate \"short "\r
 "name\""\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptMergeDupNames..Caption\r
-#: filter.dfm:463\r
+#: filter.dfm:462\r
 msgid "\"short names\""\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptMergeDistance..Hint\r
-#: filter.dfm:472\r
+#: filter.dfm:471\r
 msgid "Merge waypoints separated by less then"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptMergeDistance..Caption\r
-#: filter.dfm:473\r
+#: filter.dfm:472\r
 msgid "Radius"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cobWayptMergeDist....Items.Strings\r
-#: filter.dfm:487\r
+#: filter.dfm:486\r
 msgid "Feet"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cobWayptMergeDist....Items.Strings\r
-#: filter.dfm:488\r
+#: filter.dfm:487\r
 #: filter.pas:163\r
 msgid "Miles"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptSort..Hint\r
-#: filter.dfm:505\r
+#: filter.dfm:504\r
 msgid "Sort waypoints by \"short name\" or by "\r
 "description"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptSort..Caption\r
-#: filter.dfm:506\r
+#: filter.dfm:505\r
 msgid "Sort"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptMergeDups..Hint\r
-#: filter.dfm:514\r
+#: filter.dfm:513\r
 msgid "Merge duplicate waypoints"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptMergeDups..Caption\r
-#: filter.dfm:515\r
+#: filter.dfm:514\r
 msgid "Duplicatates"\r
 msgstr ""\r
 \r
@@ -366,14 +367,14 @@ msgstr ""
 #. frmMain..Panel2..btnFilter..Caption\r
 #: main.dfm:404\r
 #. frmMain..ActionList1..acFilterSelect..Caption\r
-#: main.dfm:907\r
+#: main.dfm:909\r
 msgid "&Filter"\r
 msgstr ""\r
 \r
 #. frmMain..Panel2..btnProcess..Caption\r
 #: main.dfm:428\r
 #. frmMain..ActionList1..acConvert..Caption\r
-#: main.dfm:900\r
+#: main.dfm:902\r
 msgid "let's go"\r
 msgstr ""\r
 \r
@@ -382,100 +383,143 @@ msgstr ""
 msgid "Fixedsys"\r
 msgstr ""\r
 \r
-#. frmMain..stbMain......Text\r
-#: main.dfm:473\r
-msgid "http://sourceforge.net/projects/gpsbabel"\r
+#. frmMain..stbMain........Text\r
+#: main.dfm:475\r
+msgid "http://www.gpsbabel.org (http://sourceforge.net/projects/gpsbabel)"\r
 msgstr ""\r
 \r
 #. frmMain..OpenDialog..Filter\r
-#: main.dfm:480\r
+#: main.dfm:482\r
 msgid "Garmin Mapsource|*.gdb|Garmin Mapsource mps|*.mps|All "\r
 "files|*.*"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acConvert..Category\r
-#: main.dfm:899\r
+#: main.dfm:901\r
 #. frmMain..ActionList1..acFilterSelect..Category\r
-#: main.dfm:906\r
+#: main.dfm:908\r
 msgid "Babel"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acFileExit..Category\r
-#: main.dfm:912\r
+#: main.dfm:914\r
 msgid "File"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acFileExit..Caption\r
-#: main.dfm:913\r
+#: main.dfm:915\r
 msgid "E&xit"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acHelpAbout..Category\r
-#: main.dfm:918\r
+#: main.dfm:920\r
 #. frmMain..ActionList1..acHelpIntro..Category\r
-#: main.dfm:923\r
+#: main.dfm:925\r
 #. frmMain..ActionList1..acHelpReadme..Category\r
-#: main.dfm:927\r
+#: main.dfm:929\r
 msgid "Help"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acHelpAbout..Caption\r
-#: main.dfm:919\r
+#: main.dfm:921\r
 msgid "&About"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acHelpIntro..Caption\r
-#: main.dfm:924\r
+#: main.dfm:926\r
 msgid "&Intro"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acHelpReadme..Caption\r
-#: main.dfm:928\r
+#: main.dfm:930\r
 #. frmReadme..Caption\r
 #: readme.dfm:6\r
 msgid "GPSBabel README"\r
 msgstr ""\r
 \r
 #. frmMain..MainMenu1..mnuFile..Caption\r
-#: main.dfm:937\r
+#: main.dfm:939\r
 msgid "&File"\r
 msgstr ""\r
 \r
+#. frmMain..MainMenu1..mnuOptions..Caption\r
+#: main.dfm:945\r
+msgid "&Options"\r
+msgstr ""\r
+\r
+#. frmMain..MainMenu1..mnuOptions..mnuSynthesizeShortNames..Caption\r
+#: main.dfm:947\r
+msgid "Synthesize short names"\r
+msgstr ""\r
+\r
+#. frmMain..MainMenu1..mnuOptions..mnuSynthesizeShortNames....Hint\r
+#: main.dfm:950\r
+msgid "Ignore \"short\" names from source data and synthesize them from the "\r
+"long name"\r
+msgstr ""\r
+\r
 #. frmMain..MainMenu1..mnuHelp..Caption\r
-#: main.dfm:943\r
+#: main.dfm:956\r
 msgid "&Help"\r
 msgstr ""\r
 \r
-#: main.pas:249\r
+#. frmMain..MainMenu1..mnuHelp..N1..Caption\r
+#: main.dfm:964\r
+msgid "-"\r
+msgstr ""\r
+\r
+#: main.pas:152\r
+msgid " (Preview)"\r
+msgstr ""\r
+\r
+#: main.pas:255\r
 msgid "All files|*.*"\r
 msgstr ""\r
 \r
-#: main.pas:338\r
+#: main.pas:344\r
 msgid "|All files|*.*"\r
 msgstr ""\r
 \r
-#: main.pas:377\r
+#: main.pas:385\r
 msgid "File %s not found."\r
 msgstr ""\r
 \r
-#: main.pas:394\r
+#: main.pas:402\r
 msgid "File \"%s\" exists ! Overwrite ?"\r
 msgstr ""\r
 \r
-#: main.pas:395\r
+#: main.pas:403\r
 msgid "Warning"\r
 msgstr ""\r
 \r
-#: main.pas:420\r
+#: main.pas:428\r
 msgid "Could not run \"gpsbabel.exe\"!"\r
 msgstr ""\r
 \r
-#: main.pas:429\r
+#: main.pas:437\r
 msgid "Converted successfully from \"%s\" to "\r
 "\"%s\"."\r
 msgstr ""\r
 \r
-#: main.pas:430\r
+#: main.pas:438\r
 msgid "Success"\r
 msgstr ""\r
 \r
+#: utils.pas:76\r
+msgid "Error WINAPI: Could not create \"NamedPipe\"!"\r
+msgstr ""\r
+\r
+#: utils.pas:81\r
+msgid "\"gpsbabel.exe\" not found!!!"\r
+msgstr ""\r
+\r
+#. dwCreationFlags,     // creation flags\r
+#: utils.pas:100\r
+msgid "Could not run \"gpsbabel.exe\" (Error "\r
+"%d)!"\r
+msgstr ""\r
+\r
+#: utils.pas:106\r
+msgid "\"gpsbabel.exe\" returned error 0x%x (%d)"\r
+msgstr ""\r
+\r

diff --git a/gpsbabel/win32/gui-2/utils.pas b/gpsbabel/win32/gui-2/utils.pas
index f114227c73b1e77a5dfd57b6d8039104b83ca6a7..aeede97b780588329f8e4bbf381b41c6e78b1285 100644 (file)
--- a/gpsbabel/win32/gui-2/utils.pas
+++ b/gpsbabel/win32/gui-2/utils.pas
@@ -33,9 +33,12 @@ function ReadProfile(const Tag: Integer): string;
 function BackupProperties(Instance: TObject; Properties: TStrings; Backup: TStringList): Boolean;\r
 procedure RestoreProperties(Instance: TObject; Backup: TStringList);\r
 \r
+procedure FixStaticText(AComponent: TComponent);\r
+\r
 implementation\r
 \r
 uses\r
+  StdCtrls,\r
   common;\r
 \r
 function GetShortName(const PathName: string): string;\r
@@ -65,24 +68,17 @@ begin
    \r
   sCmd := SysUtils.Format('%s %s ', [gpsbabel_exe, CommandLine]);\r
 \r
-{  i := WinExec(PChar(sCmd), SW_SHOWNORMAL);\r
-  if (i <> 33) then\r
-  begin\r
-    MessageBox(0, 'There was an error.', 'Uhps', MB_OK);\r
-    Exit;\r
-  end;\r
-}\r
   SecurityAttr.nLength := sizeof (TSECURITYATTRIBUTES);\r
   SecurityAttr.bInheritHandle := true;\r
   SecurityAttr.lpSecurityDescriptor := nil;\r
 \r
   if not CreatePipe(hRead, hWrite, @SecurityAttr, 0) then\r
-    raise eGPSBabelError.Create('Konnte "NamedPipe" nicht anlegen!');\r
+    raise eGPSBabelError.Create(_('Error WINAPI: Could not create "NamedPipe"!'));\r
 \r
   try\r
 \r
     if not FileExists(gpsbabel_exe) then\r
-      raise eGPSBabelError.Create('gpsbabel.exe wurde nicht gefunden!');\r
+      raise eGPSBabelError.Create(_('"gpsbabel.exe" not found!!!'));\r
 \r
     FillChar (StartupInfo, Sizeof (StartupInfo), #0);\r
 \r
@@ -95,31 +91,19 @@ begin
 \r
     FillChar(ProcessInfo, SizeOf(ProcessInfo), #0);\r
 \r
-    if not CreateProcess (\r
-      nil,                // lpApplicationName    // pointer to name of executable module\r
-      // sCmd includes both the exec name and the command line parms in this call\r
-      pchar (sCmd),       // lpCommandLine,       // pointer to command line string\r
-      nil,                // lpProcessAttributes, // pointer to process security attributes\r
-      nil,                // lpThreadAttributes,  // pointer to thread security attributes\r
-      true,               // bInheritHandles,     // handle inheritance flag\r
-      CREATE_NEW_CONSOLE, // dwCreationFlags,     // creation flags\r
-      nil,                // lpEnvironment,       // pointer to new environment block\r
-      nil,                // lpCurrentDirectory,  // pointer to current directory name\r
-      StartupInfo,        // lpStartupInfo,       // pointer to STARTUPINFO\r
-      ProcessInfo)        // lpProcessInformation // pointer to PROCESS_INFORMATION\r
-      then\r
+    if not CreateProcess(nil,\r
+      pchar(sCmd), nil, nil, true, CREATE_NEW_CONSOLE, // dwCreationFlags,     // creation flags\r
+      nil, nil, StartupInfo, ProcessInfo) then\r
     begin\r
       Error := GetLastError;\r
       raise eGPSBabelError.CreateFmt(\r
-        'gpsbabel.exe konnte nicht gestartet werden (Fehler %d).', [Error]);\r
+        _('Could not run "gpsbabel.exe" (Error %d)!'), [Error]);\r
     end;\r
-\r
     while (WaitforSingleObject (ProcessInfo.hProcess, 0)) <> WAIT_OBJECT_0 do sleep(100);\r
-\r
     if not GetExitCodeProcess(ProcessInfo.hProcess, Error) then Error := 0;\r
 \r
     if ((Error <> 0) and (Error <> 1)) then\r
-      raise eGPSBabelError.CreateFmt('Schade, "gpsbabel.exe" verlies uns mit Fehler 0x%x (%d)', [Error, Error]);\r
+      raise eGPSBabelError.CreateFmt(_('"gpsbabel.exe" returned error 0x%x (%d)'), [Error, Error]);\r
 \r
     s := '';\r
 \r
@@ -207,4 +191,28 @@ procedure RestoreProperties(Instance: TObject; Backup: TStringList);
 begin\r
 end;\r
 \r
+procedure FixStaticText(AComponent: TComponent);\r
+var\r
+  i, j: Integer;\r
+  c: TComponent;\r
+  s: TStaticText;\r
+begin\r
+  j := AComponent.ComponentCount;\r
+  for i := 0 to j - 1 do\r
+  begin\r
+    c := AComponent.Components[i];\r
+    if (c.ComponentCount > 0) then FixStaticText(c);\r
+\r
+    if not c.InheritsFrom(TStaticText) then Continue;\r
+\r
+    s := c as TStaticText;\r
+    if (s.BorderStyle = sbsNone) then Continue;\r
+\r
+    if (s.Alignment = taLeftJustify) then\r
+      s.Caption := '   ' + s.Caption\r
+    else if (s.Alignment = taRightJustify) then\r
+      s.Caption := s.Caption + '  ';\r
+  end;\r
+end;\r
+\r
 end.\r